From 90196d7e5ea063b604c493b1d1248e1c4683e5bc Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 13 Sep 2005 15:08:43 +0000 Subject: [PATCH] Add some strings containing multibyte characters. 2005-09-13 Matthias Clasen * tests/testentrycompletion.c (create_simple_completion_model): Add some strings containing multibyte characters. * gtk/gtkentrycompletion.c (gtk_entry_completion_real_insert_prefix): Fix prefix insertion for multibyte characters. (#316095, Tommi Komulainen) --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ gtk/gtkentrycompletion.c | 2 +- tests/testentrycompletion.c | 7 +++++++ 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8d8b7e5277..9f8906f7fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2005-09-13 Matthias Clasen + * tests/testentrycompletion.c (create_simple_completion_model): Add + some strings containing multibyte characters. + + * gtk/gtkentrycompletion.c (gtk_entry_completion_real_insert_prefix): + Fix prefix insertion for multibyte characters. (#316095, + Tommi Komulainen) + * gtk/gtktreeview.c (gtk_tree_view_create_row_drag_icon): * gtk/gtkiconview.c (gtk_icon_view_create_drag_icon): Silently return NULL if the widget is not realized. (#316023, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 8d8b7e5277..9f8906f7fc 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,12 @@ 2005-09-13 Matthias Clasen + * tests/testentrycompletion.c (create_simple_completion_model): Add + some strings containing multibyte characters. + + * gtk/gtkentrycompletion.c (gtk_entry_completion_real_insert_prefix): + Fix prefix insertion for multibyte characters. (#316095, + Tommi Komulainen) + * gtk/gtktreeview.c (gtk_tree_view_create_row_drag_icon): * gtk/gtkiconview.c (gtk_icon_view_create_drag_icon): Silently return NULL if the widget is not realized. (#316023, diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c index 9b558e8b1b..2c327153ae 100644 --- a/gtk/gtkentrycompletion.c +++ b/gtk/gtkentrycompletion.c @@ -1552,7 +1552,7 @@ gtk_entry_completion_real_insert_prefix (GtkEntryCompletion *completion, gint pos = prefix_len; gtk_editable_insert_text (GTK_EDITABLE (completion->priv->entry), - prefix + key_len, -1, &pos); + prefix + strlen (key), -1, &pos); gtk_editable_select_region (GTK_EDITABLE (completion->priv->entry), key_len, prefix_len); diff --git a/tests/testentrycompletion.c b/tests/testentrycompletion.c index b806b016be..92f69d432c 100644 --- a/tests/testentrycompletion.c +++ b/tests/testentrycompletion.c @@ -111,6 +111,12 @@ create_simple_completion_model (void) gtk_list_store_set (store, &iter, 0, "Totipalmi", -1); gtk_list_store_append (store, &iter); gtk_list_store_set (store, &iter, 0, "zombie", -1); + gtk_list_store_append (store, &iter); + gtk_list_store_set (store, &iter, 0, "a\303\246x", -1); + gtk_list_store_append (store, &iter); + gtk_list_store_set (store, &iter, 0, "a\303\246y", -1); + gtk_list_store_append (store, &iter); + gtk_list_store_set (store, &iter, 0, "a\303\246z", -1); return GTK_TREE_MODEL (store); } @@ -314,6 +320,7 @@ main (int argc, char *argv[]) /* Create the completion object */ completion = gtk_entry_completion_new (); + gtk_entry_completion_set_inline_completion (completion, TRUE); /* Assign the completion to the entry */ gtk_entry_set_completion (GTK_ENTRY (entry), completion); -- 2.30.2